From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 4 Nov 2014 18:24:27 +0000 (+0100)
Subject: ostree-repo-pull: Remove currently #if 0 static delta code
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1057
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1c2e20af25b21abc0dee1547a0d5bad1a21c0b58;p=ostree.git

ostree-repo-pull: Remove currently #if 0 static delta code

We can readd this in the static deltas work.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 8391d9c4..8ac4264f 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1198,54 +1198,6 @@ load_remote_repo_config (OtPullData    *pull_data,
   return ret;
 }
 
-#if 0
-static gboolean
-request_static_delta_meta_sync (OtPullData  *pull_data,
-                                const char  *ref,
-                                const char  *checksum,
-                                GVariant   **out_delta_meta,
-                                GCancellable *cancellable,
-                                GError     **error)
-{
-  gboolean ret = FALSE;
-  gs_free char *from_revision = NULL;
-  SoupURI *target_uri = NULL;
-  gs_unref_variant GVariant *ret_delta_meta = NULL;
-
-  if (!ostree_repo_resolve_rev (pull_data->repo, ref, TRUE, &from_revision, error))
-    goto out;
-
-  if (from_revision == NULL)
-    {
-      initiate_commit_scan (pull_data, checksum);
-    }
-  else
-    {
-      gs_free char *delta_name = _ostree_get_relative_static_delta_path (from_revision, checksum);
-      gs_unref_bytes GBytes *delta_meta_data = NULL;
-      gs_unref_variant GVariant *delta_meta = NULL;
-
-      target_uri = suburi_new (pull_data->base_uri, delta_name, NULL);
-
-      if (!fetch_uri_contents_membuf_sync (pull_data, target_uri, FALSE, TRUE,
-                                           &delta_meta_data,
-                                           pull_data->cancellable, error))
-        goto out;
-
-      if (delta_meta_data)
-        {
-          ret_delta_meta = ot_variant_new_from_bytes ((GVariantType*)OSTREE_STATIC_DELTA_META_FORMAT,
-                                                      delta_meta_data, FALSE);
-        }
-    }
-  
-  ret = TRUE;
-  gs_transfer_out_value (out_delta_meta, &ret_delta_meta);
- out:
-  return ret;
-}
-#endif
-
 static void
 process_one_static_delta_meta (OtPullData   *pull_data,
                                GVariant     *delta_meta)